projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 16463f8) | patch
error out when another branch has been manually merged into the adjusted branch
authorJoey Hess <joeyh@joeyh.name>
Wed, 20 Aug 2025 17:28:03 +0000 (13:28 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 20 Aug 2025 17:28:03 +0000 (13:28 -0400)
commitfd89e611b2310b46368c91bcd79999b0ba8462a3
tree87cc6f5ff585aa9521c58c766ff4d2f06f62b8e6tree | snapshot
parent16463f8f02e93bb561b8d9d1906709fe98aa0e8bcommit | diff
error out when another branch has been manually merged into the adjusted branch

This avoids losing the merge commit when re-running git-annex adjust in the
adjusted branch.

It also makes git-annex sync error out, rather than displaying a warning
and exiting successfully.

Sponsored-by: Leon Schuermann on Patreon
Annex/AdjustedBranch.hs diff | blob | history
CHANGELOG diff | blob | history
doc/bugs/Re-Adjust_Loses_Commits/comment_2_5b9c6c1966f967ff417c2acc39cfada4._comment [new file with mode: 0644] blob
doc/git-annex-adjust.mdwn diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.